pull: Don't print, just use progress callback
authorColin Walters <walters@verbum.org>
Fri, 21 Mar 2014 18:52:56 +0000 (14:52 -0400)
committerColin Walters <walters@verbum.org>
Fri, 21 Mar 2014 18:52:56 +0000 (14:52 -0400)
More work on removing g_print() from the library.

src/libostree/ostree-repo-pull.c

index 194c4ade2a65b2f160090269b5b55de628dc1d88..fa50b9bde8f455894565ff012b51f728579f98b4 100644 (file)
@@ -1230,7 +1230,7 @@ ostree_repo_pull (OstreeRepo               *self,
   end_time = g_get_monotonic_time ();
 
   bytes_transferred = ostree_fetcher_bytes_transferred (pull_data->fetcher);
-  if (bytes_transferred > 0)
+  if (bytes_transferred > 0 && pull_data->progress)
     {
       guint shift; 
       gs_free char *msg = NULL;
@@ -1245,10 +1245,7 @@ ostree_repo_pull (OstreeRepo               *self,
                              (guint64)(bytes_transferred / shift),
                              shift == 1 ? "B" : "KiB",
                              (guint) ((end_time - start_time) / G_USEC_PER_SEC));
-      if (pull_data->progress)
-        ostree_async_progress_set_status (pull_data->progress, msg);
-      else
-        g_print ("%s\n", msg);
+      ostree_async_progress_set_status (pull_data->progress, msg);
     }
 
   ret = TRUE;